| commit | 7a031e5c8c444cac4c199ecf6538eb89f8862071 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <gitster@pobox.com> | Mon Aug 30 23:54:25 2021 |
| committer | Junio C Hamano <gitster@pobox.com> | Mon Aug 30 23:54:25 2021 |
| tree | bef184dc029d8342f45d83bace3deeedae0e6b7b | |
| parent | d2e30562620c9dda7b685f4d3bcb8acab537d97c [diff] [blame] |
Autogenerated HTML docs for v2.33.0-113-g6c408
diff --git a/git-merge.txt b/git-merge.txt index 3819fad..e4f3352 100644 --- a/git-merge.txt +++ b/git-merge.txt
@@ -61,6 +61,8 @@ OPTIONS ------- +:git-merge: 1 + include::merge-options.txt[] -m <msg>::